Correct the documentation for new_order. (#124790, Tim-Philipp Müller)

	* gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
	the documentation for new_order.  (#124790, Tim-Philipp Müller)

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width):
	Reset use_resized_width when setting fixed_width.  (#108612,
	Felipe Heidrich)

diff --git a/ChangeLog b/ChangeLog
index 66fd290bfcdc9ea2e367fc585658be07bef8552f..65e754e6f38f24084380c4c71f6f35d1f78d74dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Jan 31 22:41:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
+       the documentation for new_order.  (#124790, Tim-Philipp Müller)
+
+Sat Jan 31 22:38:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
+       Reset use_resized_width when setting fixed_width.  (#108612, 
+       Felipe Heidrich) 
+
 Sat Jan 31 16:27:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66fd290bfcdc9ea2e367fc585658be07bef8552f..65e754e6f38f24084380c4c71f6f35d1f78d74dd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Sat Jan 31 22:41:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
+       the documentation for new_order.  (#124790, Tim-Philipp Müller)
+
+Sat Jan 31 22:38:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
+       Reset use_resized_width when setting fixed_width.  (#108612, 
+       Felipe Heidrich) 
+
 Sat Jan 31 16:27:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 66fd290bfcdc9ea2e367fc585658be07bef8552f..65e754e6f38f24084380c4c71f6f35d1f78d74dd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Sat Jan 31 22:41:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
+       the documentation for new_order.  (#124790, Tim-Philipp Müller)
+
+Sat Jan 31 22:38:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
+       Reset use_resized_width when setting fixed_width.  (#108612, 
+       Felipe Heidrich) 
+
 Sat Jan 31 16:27:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 66fd290bfcdc9ea2e367fc585658be07bef8552f..65e754e6f38f24084380c4c71f6f35d1f78d74dd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Sat Jan 31 22:41:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
+       the documentation for new_order.  (#124790, Tim-Philipp Müller)
+
+Sat Jan 31 22:38:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
+       Reset use_resized_width when setting fixed_width.  (#108612, 
+       Felipe Heidrich) 
+
 Sat Jan 31 16:27:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 66fd290bfcdc9ea2e367fc585658be07bef8552f..65e754e6f38f24084380c4c71f6f35d1f78d74dd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Sat Jan 31 22:41:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Correct
+       the documentation for new_order.  (#124790, Tim-Philipp Müller)
+
+Sat Jan 31 22:38:07 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): 
+       Reset use_resized_width when setting fixed_width.  (#108612, 
+       Felipe Heidrich) 
+
 Sat Jan 31 16:27:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmain.c (gtk_key_snooper_remove): Don't leak the

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 96c8c48d4d97df2f56a1e2916d3774bb8f73a658..7434efd156bebcefb8d300f033ed58ece64a6a89 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1400,9 +1400,9 @@ gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
  * @tree_model: A #GtkTreeModel
  * @path: A #GtkTreePath pointing to the tree node whose children have been reordered
  * @iter: A valid #GtkTreeIter pointing to the node whose children have been reordered
- * @new_order: an array of integers containing the new indices of the children,
- *      i.e. the former child <literal>n</literal> is now at position
- *      @new_order<literal>[n]</literal>. 
+ * @new_order: an array of integers mapping the current position of each child
+ *      to its old position before the re-ordering,
+ *      i.e. @new_order<literal>[newpos] = oldpos</literal>.
  * 
  * Emits the "rows_reordered" signal on @tree_model.  This should be called by
  * models when their rows have been reordered.  

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 15dab9faa5e76ebfecd3adc70a3c9d9e029797ff..222c6a46bd23a5e58ffb287f8f9774bb8e7462af 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1751,7 +1751,7 @@ gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column)
  * @resizable: %TRUE, if the column can be resized
  * 
  * If @resizable is %TRUE, then the user can explicitly resize the column by
- * grabbing the outer edge of the column button.  If resizable is TRUE and
+ * grabbing the outer edge of the column button.  If resizable is %TRUE and
  * sizing mode of the column is #GTK_TREE_VIEW_COLUMN_AUTOSIZE, then the sizing
  * mode is changed to #GTK_TREE_VIEW_COLUMN_GROW_ONLY.
  **/
@@ -1880,6 +1880,7 @@ gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
   g_return_if_fail (fixed_width > 0);
 
   tree_column->fixed_width = fixed_width;
+  tree_column->use_resized_width = FALSE;
 
   if (tree_column->tree_view &&
       GTK_WIDGET_REALIZED (tree_column->tree_view) &&